*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f1e3a20170944e7b79e66f30b72dae99cdc1c6ed..fac86629680c0b4cd3acf7e2a593faa57c83b8f3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-26  Richard Stallman  <rms@gnu.org>
+
+       * files.el (conf-mode-maybe): New function.
+       (auto-mode-alist): Use conf-mode-maybe for .conf etc.
+
 2007-12-26  Martin Rudalics  <rudalics@gmx.at>
 
        * textmodes/fill.el (fill-find-break-point): Fix doc-string typo.